Check "color" argument in gtk_color_button_set_color ()

	* gtk/gtkcolorbutton.c: Check "color" argument in gtk_color_button_set_color ()

diff --git a/ChangeLog b/ChangeLog
index 2d2e1b0b2fad9a47425dce4d4841e8fcd4fbcc4d..01d5b99a2c44b0ed5051a27ecfbebf3fedb0188c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-14  Tristan Van Berkom <tvb@cvs.gnome.org>
+
+       * gtk/gtkcolorbutton.c: Check "color" argument in gtk_color_button_set_color ()
+
 2005-09-14  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_get_type): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2d2e1b0b2fad9a47425dce4d4841e8fcd4fbcc4d..01d5b99a2c44b0ed5051a27ecfbebf3fedb0188c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2005-09-14  Tristan Van Berkom <tvb@cvs.gnome.org>
+
+       * gtk/gtkcolorbutton.c: Check "color" argument in gtk_color_button_set_color ()
+
 2005-09-14  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_get_type): 

diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 677e9f58b6dd1dd48e8a17543558700d336704f8..c41f708ad47599a39fb46905b0763ce36a9f4569 100644 (file)
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -780,6 +780,7 @@ gtk_color_button_set_color (GtkColorButton *color_button,
                            const GdkColor *color)
 {
   g_return_if_fail (GTK_IS_COLOR_BUTTON (color_button));
+  g_return_if_fail (color != NULL);
 
   color_button->priv->color.red = color->red;
   color_button->priv->color.green = color->green;